From 88ab5cfe5e64fd795710107cf8f83a16f863735a Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Sat, 13 Dec 2025 09:32:27 +0100
Subject: [PATCH] javadoc-optional

Gemeinsame Unterverzeichnisse: odk-old/config und odk/config.
Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs.
Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples.

Gemeinsame Unterverzeichnisse: odk-old/config und odk/config.
Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs.
Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples.

Gbp-Pq: Name javadoc-optional.diff
---
 Repository.mk             |   2 +-
 configure.ac              | Bin 588042 -> 588761 bytes
 odk/CustomTarget_check.mk |   2 +-
 odk/Module_odk.mk         |   6 ++++--
 odk/util/check.pl         |   2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Repository.mk b/Repository.mk
index f4e732f9d01..aa22f4add9f 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -920,7 +920,7 @@ $(eval $(call gb_Helper_register_packages_for_install,sdk,\
 	odk_settings \
 	odk_settings_generated \
 	$(if $(ENABLE_JAVA), \
-		odk_javadoc \
+		$(if $(JAVADOC),odk_javadoc) \
 		odk_uno_loader_classes \
 	) \
 	odk_scripts \
diff --git a/configure.ac b/configure.ac
index 7a1173e47fae559464f7ca342e89a80725bae220..61b74acd68cc63d159137b328efe7e1c26b0cc3b 100644
GIT binary patch
delta 688
zcmaJ;&ubGw6lT)5>25+6n$o7kh+|UxL7P%hC<p;#3u;<ZCAJ_E!nT>1wQ*Ovn~D@^
z4??9N6#{uR7x5|z3Tjah{R2b<Po4~T)q_1)1IfnO?NZIffj2Ynz3=<xo0;|P*q5Ey
z>I)LC$v(=*m21k9lGo?6m5U2~Sl=W)-EIY+S4ns;x$%G;UP*DR!?Kx_v&z?*W-6wt
zYa=uszp0u<y==x^0h(70Wv;{wdX;Hx(ScFDK&K}r>3@~dx=9yVi7hFbNmY%SMaI?h
zs_e+c_51>zR}6;l9+E-yuan@O%io*i&;iF`c6fOAezvKc>nL%H8QC>|jqvdB=-Tqv
zU}&y~X|~TC7mm_{399Kh+JxI7Ni9&5877Sm{;PtIK0pLtHsJ(b4tQm}+W;9!3kL9H
zz!Si?4UllC1(C|B5a5L_0dTSf`|$A-A%f4Q1Rvh9(`8xc#rv<s0KREKsCr)L$FD6o
zhG$2F-s+AZqkde7Rq90%KYjLyIAuYiG8z_l1@Bp~ADizXgsT>D4|#1t9Di-YK;@$-
zV){FHv1!2=W`BT)^#%ZrwV`jt`8qxoRG&my$zVQ7qGiosCQT)0lM~b9yw008jxP?v
z-giQHCpn(W%$&|#I^xpKWzM8H`>5~lt95pwG(n>{`;!C%9b%YnLqC3d>J6@Kw1J1f
M!@IT7?p|*E0leqw;s5{u

delta 220
zcmcclUAgO%a>Euzsafs2XEOpZ6A&|R-#wc}CTY6nTNah+9|G7ora#!r$~yhPLl(X1
z_5WFfrziYlVV(S^pJV!re=H``y&thiOn>nYNQj?e<DD+}pG9$cJtHgobld+xu`Wh-
zk?HmRtX$Kp|FcL>xBkH-J$>7M7V*gj+xVtG{?B4KUE&Xm=hRYG1F)v4TUe#0zhP(P
zp8As2aPl-af$3I^thOL2$?4`VS@}7<9K#%4{GBzYKVSr^6jEmvnx1f(gS$PGi4}<1
NfS7%ICKE@&PXMe&QKbL?

diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index 0966fa57746..fdf35505023 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -35,7 +35,7 @@ $(gb_CustomTarget_workdir)/odk/check/checkbin : \
 		$(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_config_win)) \
 		$(call gb_Package_get_target,odk_docs) \
 		$(call gb_Package_get_target,odk_html) \
-		$(if $(ENABLE_JAVA),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \
+		$(if $(JAVADOC),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \
 		$(call gb_Package_get_target,odk_settings) \
 		$(call gb_Package_get_target,odk_settings_generated)
 ifneq ($(gb_SUPPRESS_TESTS),)
diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index d30c7164776..500348a7ea6 100644
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -43,8 +43,10 @@ endif
 ifneq ($(ENABLE_JAVA),)
 $(eval $(call gb_Module_add_targets,odk,\
 	CustomTarget_classes \
-	CustomTarget_javadoc \
-	GeneratedPackage_odk_javadoc \
+	$(if $(JAVADOC),\
+		CustomTarget_javadoc \
+		GeneratedPackage_odk_javadoc \
+	) \
 	GeneratedPackage_uno_loader_classes \
 ))
 endif
diff --git a/odk/util/check.pl b/odk/util/check.pl
index 8c1728671d9..405d84a72db 100644
--- a/odk/util/check.pl
+++ b/odk/util/check.pl
@@ -181,7 +181,7 @@ if (-d "$SdkDir") {
     # improvement required
     my $solar_java = $ENV{"ENABLE_JAVA"};
     my $JDK = $ENV{"JDK"};
-    if (defined($solar_java) && $solar_java ne "" && (!defined($JDK) || $JDK ne "gcj")) {
+    if (defined($solar_java) && $solar_java ne "" && $ENV{"JAVADOC"} ne "") {
     print "check java docu: ";
     if (check_dir("docs/java/ref")) {
         if (!check_file("docs/java/ref/index.html")) {
-- 
2.30.2